Skip to content

cargo-c: fix cross and static#198410

Closed
yu-re-ka wants to merge 8 commits intoNixOS:stagingfrom
yu-re-ka:rust-cross
Closed

cargo-c: fix cross and static#198410
yu-re-ka wants to merge 8 commits intoNixOS:stagingfrom
yu-re-ka:rust-cross

Conversation

@yu-re-ka
Copy link
Contributor

@yu-re-ka yu-re-ka commented Oct 29, 2022 •
edited
Loading

Description of changes

This depends on several PRs, and is also useful for testing the changes made in those:

#198309
#198311
#198409

With this branch, I successfully built the following derivations:

-A fd \
-A cargo-c \
-A pkgsMusl.fd \
-A pkgsMusl.cargo-c \
-A pkgsStatic.fd \
-A pkgsStatic.cargo-c \
-A pkgsCross.musl64.fd \
-A pkgsCross.musl64.cargo \
-A pkgsCross.musl64.cargo-c \
-A pkgsCross.aarch64-multiplatform.fd \
-A pkgsCross.aarch64-multiplatform.cargo \
-A pkgsCross.aarch64-multiplatform.cargo-c \
-A pkgsCross.aarch64-multiplatform.pkgsStatic.fd \
-A pkgsCross.aarch64-multiplatform.pkgsStatic.cargo-c \
-A pkgsMusl.pkgsCross.gnu64.fd \
-A pkgsMusl.pkgsCross.gnu64.cargo \
-A pkgsMusl.pkgsCross.gnu64.cargo-c \
-A pkgsMusl.pkgsCross.aarch64-multiplatform.fd \
-A pkgsMusl.pkgsCross.aarch64-multiplatform.cargo \
-A pkgsMusl.pkgsCross.aarch64-multiplatform.cargo-c \
-A pkgsMusl.pkgsCross.aarch64-multiplatform.pkgsStatic.fd \
-A pkgsMusl.pkgsCross.aarch64-multiplatform.pkgsStatic.cargo-c
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

yuyuyureka and others added 8 commits October 28, 2022 20:16
@yuyuyureka
cargo-c: 0.9.2 -> 0.9.13
39cc140
@yuyuyureka
cargoSetupHook: set crt-static flag for host and build platforms sepa…
e802126 
…rately
@yuyuyureka
cargo: no longer broken on musl
deab941
@alyssais @yuyuyureka
pkg-config: set pkg-config-rs-compatible env vars
4efa7c2 
By moving this from the rustc derivation, the necessary environment
variables will also be set for other Rust packages that need them,
like cargo.
@alyssais @yuyuyureka
cargo: run libcurl link test when cross-compiling
60e1814 
It's not possible to run installCheckPhase when cross-compiling, so we
have to tack this on to postInstall instead.
@alyssais @yuyuyureka
cargo: add missing zlib build dependency
ab29bae 
This fixes cross-compilation.
@yuyuyureka
file: fix doCheck conditional for pkgsMusl.pkgsCross.gnu64
3439644
@yuyuyureka
cargo-c: fix cross and static
5c450c5
@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Oct 29, 2022
@yu-re-ka yu-re-ka changed the base branch from staging-next to staging October 29, 2022 06:58
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. labels Oct 29, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Oct 29, 2022
@yu-re-ka yu-re-ka closed this Nov 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@retrry retrry Awaiting requested review from retrry

@globin globin Awaiting requested review from globin

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

@cstrahan cstrahan Awaiting requested review from cstrahan

@doronbehar doronbehar Awaiting requested review from doronbehar

@madjar madjar Awaiting requested review from madjar

@zaninime zaninime Awaiting requested review from zaninime

Assignees

No one assigned

Labels

6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@yu-re-ka @yuyuyureka @alyssais